Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch '2.3' of ezsystems/ezplatform-admin-ui into 4.5 #856

Merged
merged 4 commits into from
Aug 3, 2023
Merged

Merge branch '2.3' of ezsystems/ezplatform-admin-ui into 4.5 #856

merged 4 commits into from
Aug 3, 2023

Conversation

ezrobot
Copy link
Contributor

@ezrobot ezrobot commented Aug 1, 2023 •
edited by alongosz
Loading

barw4 and others added 2 commits July 31, 2023 15:10
@barw4
IBX-6017: Avoid loading whole content in the Content Tree (#2104)
6a8d87c 
* IBX-6017: Avoid loading whole content in the Content Tree

* IBX-6017: Adapted solution to use `loadVersionInfoListByContentInfo` method

* IBX-6017: CS
@mateuszdebinski
IBX-5852: Created a new layout for error pages to prevent leak data (…
0ceabb1 
…#2106)

* IBX-5852: Created a new layout for error pages to prevent leak data

* Removed unnecessary code, Corrected CD

---------

Co-authored-by: Mateusz Dębiński <mateusz.debinski@ibexa.co>
Merge remote-tracking branch 'origin/2.3' into temp_2.3_to_4.5
6fefc88 
# Conflicts:
#	src/bundle/Resources/encore/ibexa.js.config.js
#	src/bundle/Resources/views/themes/admin/ui/error_page/403.html.twig
#	src/bundle/Resources/views/themes/admin/ui/error_page/404.html.twig
#	src/bundle/Resources/views/themes/admin/ui/error_page/unknown.html.twig
#	src/lib/UI/Module/ContentTree/NodeFactory.php
@mateuszdebinski mateuszdebinski requested review from a team August 1, 2023 14:36
@mateuszdebinski mateuszdebinski self-assigned this Aug 1, 2023
@ViniTou ViniTou requested a review from a team August 2, 2023 06:13
Merge remote-tracking branch 'origin/2.3' into temp_2.3_to_4.5
1305b1c 
# Conflicts:
#	src/bundle/Resources/encore/ibexa.js.config.js
#	src/bundle/Resources/views/themes/admin/ui/error_page/403.html.twig
#	src/bundle/Resources/views/themes/admin/ui/error_page/404.html.twig
#	src/bundle/Resources/views/themes/admin/ui/error_page/unknown.html.twig
#	src/lib/UI/Module/ContentTree/NodeFactory.php
@sonarqubecloud
Copy link

sonarqubecloud bot commented Aug 2, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot E 1 Security Hotspot
Code Smell A 1 Code Smell

No Coverage information No Coverage information
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@ViniTou ViniTou merged commit 341d5d8 into 4.5 Aug 3, 2023
@ViniTou ViniTou deleted the temp_2.3_to_4.5 branch August 3, 2023 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@konradoboza konradoboza konradoboza approved these changes

@ViniTou ViniTou ViniTou approved these changes

Assignees

@mikadamczyk mikadamczyk

@Nattfarinn Nattfarinn

@ciastektk ciastektk

@dew326 dew326

@ViniTou ViniTou

@mateuszdebinski mateuszdebinski

Labels
Ready for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@ezrobot @ViniTou @konradoboza @mikadamczyk @Nattfarinn @ciastektk @dew326 @mateuszdebinski @barw4